Set sort_indicator to FALSE when appropriate. (#153714, Reinout van

2004-10-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c
	(gtk_tree_view_column_setup_sort_column_id_callback):
	Set sort_indicator to FALSE when appropriate.  (#153714,
	Reinout van Schouwen)

diff --git a/ChangeLog b/ChangeLog
index 8fe5b8b55c17f8f594f8edcc8b811518423adee1..d12438715468685fd6f37df2737390578a2b602b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c 
+       (gtk_tree_view_column_setup_sort_column_id_callback): 
+       Set sort_indicator to FALSE when appropriate.  (#153714, 
+       Reinout van Schouwen)
+
        * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
        Fix positioning near the monitor boundaries.  (#154341,
        Ken Harris)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8fe5b8b55c17f8f594f8edcc8b811518423adee1..d12438715468685fd6f37df2737390578a2b602b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c 
+       (gtk_tree_view_column_setup_sort_column_id_callback): 
+       Set sort_indicator to FALSE when appropriate.  (#153714, 
+       Reinout van Schouwen)
+
        * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
        Fix positioning near the monitor boundaries.  (#154341,
        Ken Harris)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8fe5b8b55c17f8f594f8edcc8b811518423adee1..d12438715468685fd6f37df2737390578a2b602b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c 
+       (gtk_tree_view_column_setup_sort_column_id_callback): 
+       Set sort_indicator to FALSE when appropriate.  (#153714, 
+       Reinout van Schouwen)
+
        * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
        Fix positioning near the monitor boundaries.  (#154341,
        Ken Harris)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8fe5b8b55c17f8f594f8edcc8b811518423adee1..d12438715468685fd6f37df2737390578a2b602b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c 
+       (gtk_tree_view_column_setup_sort_column_id_callback): 
+       Set sort_indicator to FALSE when appropriate.  (#153714, 
+       Reinout van Schouwen)
+
        * gtk/gtktreeview.c (gtk_tree_view_search_position_func): 
        Fix positioning near the monitor boundaries.  (#154341,
        Ken Harris)

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 686c0492204fc210e91c1f4f91d9b14bbc2d0114..f221a5e549d9f86c458c0fb989abae3e02ccffde 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1226,10 +1226,12 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
        {
          gtk_tree_view_column_set_sort_indicator (tree_column, TRUE);
          gtk_tree_view_column_set_sort_order (tree_column, real_order);
-
-         return;
+       }
+      else 
+       {
+         gtk_tree_view_column_set_sort_indicator (tree_column, FALSE);
        }
-    }
+   }
 }
 
 
@@ -1306,6 +1308,7 @@ _gtk_tree_view_column_unset_model (GtkTreeViewColumn *column,
                                   column->sort_column_changed_signal);
       column->sort_column_changed_signal = 0;
     }
+  gtk_tree_view_column_set_sort_indicator (column, FALSE);
 }
 
 void